From 2db1218bdb8e2cf9a36bf81cb1793bfe89d9c3d3 Mon Sep 17 00:00:00 2001 From: "Jan D." Date: Sat, 9 Jan 2010 13:31:29 +0100 Subject: [PATCH] (command-line-1): Use orig-argi to check for ignored X and NS options. --- lisp/ChangeLog | 5 +++++ lisp/startup.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1166b47c950..e91616329cb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-01-09 Jan Djärv + + * startup.el (command-line-1): Use orig-argi to check for ignored X and + NS options. + 2010-01-08 Kenichi Handa * international/fontset.el (build-default-fontset-data): Exclude diff --git a/lisp/startup.el b/lisp/startup.el index da0264dba20..a8f2eae0613 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -2184,12 +2184,12 @@ A fancy display is used on graphic displays, normal otherwise." (setq cl1-line (string-to-number (match-string 1 argi)) cl1-column (string-to-number (match-string 2 argi)))) - ((setq cl1-tem (assoc argi command-line-x-option-alist)) + ((setq cl1-tem (assoc orig-argi command-line-x-option-alist)) ;; Ignore X-windows options and their args if not using X. (setq command-line-args-left (nthcdr (nth 1 cl1-tem) command-line-args-left))) - ((setq cl1-tem (assoc argi command-line-ns-option-alist)) + ((setq cl1-tem (assoc orig-argi command-line-ns-option-alist)) ;; Ignore NS-windows options and their args if not using NS. (setq command-line-args-left (nthcdr (nth 1 cl1-tem) command-line-args-left))) -- 2.30.2